chore: populate swap intent metrics and rename txHistory keys by micaelae · Pull Request #7564 · MetaMask/core

micaelae · 2026-01-07T00:53:43Z

Explanation

References

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Adds full intent-based swap/bridge flow and wiring across controllers.

Bridge Status: New submitIntent action, polling via IntentApiImpl (submit/getOrderStatus), maps intent statuses to bridge StatusTypes (incl. new SUBMITTED), records intentOrderId and aggregated srcTxHashes, updates TC tx status, event tracking adjustments; tests and snapshots added; coverage config tweaked
Bridge Controller/Types: Export Intent/IntentOrderLike; Quote now optionally includes intent; validators add IntentOrderSchema/IntentSchema and helpers
Transaction Controller: Support synthetic intent txs (skip publish/sign), convert legacy gasPrice to EIP-1559 when skipping estimates, exclude intent txs from pending tracker
New intent API util (utils/intent-api.ts) with validation and status mapping + tests
Changelogs updated; minor repo hygiene (.gitignore, suppressions).

^{Written by Cursor Bugbot for commit 06c1583. This will update automatically on new commits. Configure here.}

…StatusController

cursor

Single string `txHashes` in metadata is silently discarded

Medium Severity

The IntentOrderResponseSchema at line 78 in validators.ts allows metadata.txHashes to be either an array of hex strings or a single hex string via union([array(StrictHexStruct), StrictHexStruct]). However, the code at line 770-772 only handles the array case: when txHashes is a single string, Array.isArray() returns false, causing metadataTxHashes to become an empty array and silently discarding the hash value. If txHash is also undefined, transaction hashes could be lost entirely.

packages/bridge-status-controller/src/bridge-status-controller.ts#L769-L772

core/packages/bridge-status-controller/src/bridge-status-controller.ts

Lines 769 to 772 in 06c1583

    
           // Check metadata for additional transaction hashes 
        
           const metadataTxHashes = Array.isArray(intentOrder.metadata.txHashes) 
        
             ? intentOrder.metadata.txHashes 
        
             : [];

packages/bridge-status-controller/src/utils/validators.ts#L76-L79

core/packages/bridge-status-controller/src/utils/validators.ts

Lines 76 to 79 in 06c1583

    
           txHash: optional(StrictHexStruct), 
        
           metadata: type({ 
        
             txHashes: optional(union([array(StrictHexStruct), StrictHexStruct])), 
        
           }),

`CANCELLED` intent status incorrectly maps to `submitted` instead of `failed`

Medium Severity

The IntentOrderStatus.CANCELLED enum value is defined but not handled in the status mapping logic. In mapIntentOrderStatusToTransactionStatus, a cancelled order falls through to the default case and incorrectly returns TransactionStatus.submitted. Similarly, in #updateHistoryAndTxFromIntentOrder, cancelled orders fall through to StatusTypes.UNKNOWN. A cancelled intent order is a terminal failed state and should map to failed status, like EXPIRED does, rather than appearing as an active or unknown transaction.

packages/bridge-status-controller/src/utils/intent-api.ts#L102-L118

core/packages/bridge-status-controller/src/utils/intent-api.ts

Lines 102 to 118 in 06c1583

    
           export function mapIntentOrderStatusToTransactionStatus( 
        
             intentStatus: IntentOrderStatus, 
        
           ): TransactionStatus { 
        
             switch (intentStatus) { 
        
               case IntentOrderStatus.PENDING: 
        
               case IntentOrderStatus.SUBMITTED: 
        
                 return TransactionStatus.submitted; 
        
               case IntentOrderStatus.CONFIRMED: 
        
               case IntentOrderStatus.COMPLETED: 
        
                 return TransactionStatus.confirmed; 
        
               case IntentOrderStatus.FAILED: 
        
               case IntentOrderStatus.EXPIRED: 
        
                 return TransactionStatus.failed; 
        
               default: 
        
                 return TransactionStatus.submitted; 
        
             }

packages/bridge-status-controller/src/bridge-status-controller.ts#L745-L764

core/packages/bridge-status-controller/src/bridge-status-controller.ts

Lines 745 to 764 in 06c1583

    
           ].includes(intentOrder.status); 
        
           const isFailed = [ 
        
             IntentOrderStatus.FAILED, 
        
             IntentOrderStatus.EXPIRED, 
        
           ].includes(intentOrder.status); 
        
           const isPending = [IntentOrderStatus.PENDING].includes(intentOrder.status); 
        
           const isSubmitted = [IntentOrderStatus.SUBMITTED].includes( 
        
             intentOrder.status, 
        
           ); 
        
           if (isComplete) { 
        
             statusType = StatusTypes.COMPLETE; 
        
           } else if (isFailed) { 
        
             statusType = StatusTypes.FAILED; 
        
           } else if (isPending) { 
        
             statusType = StatusTypes.PENDING; 
        
           } else if (isSubmitted) { 
        
             statusType = StatusTypes.SUBMITTED; 
        
           } else { 
        
             statusType = StatusTypes.UNKNOWN;

…-swap-architecture-refactory-txHistory-metrics

…tory-metrics

khanti42 and others added 30 commits September 2, 2025 15:12

feat: cow-swap

da8e0be

fix: include missing metadata on intent swap transaction

0c8f25e

Merge branch 'main' into wip/cow-swap-intent

cf9d91d

Fix all lint relative error and give proper type declaration.

6cc5fe4

Fix pipeline lint issue,

c2bf9a2

fix node 22 lint and build issue.

c76a00c

Merge branch 'main' into wip/cow-swap-intent

73604f1

Update snapshot for unit tests.

63dc8ac

Fix all unit tests failure for bridge-status-controller.test.ts

331bec5

Add stub module called Intent-manager

37f72b5

add ts-bridge as dev dependancies for build

2493ab2

wip: buildable version of intent manager and bridge-status-controller.

1673f1f

wip: fix the build issue.

2ea099e

WIP: Remove the generateQuote and relative private method calls.

74e6893

feat: add a temp onlyIntent parameter.

19fdb0e

Merge branch 'main' into wip/intent-swap-architecture-refactory

dc76678

rebase from main

018cd69

Rebase from main

fdf4f04

revert back to main version

4e200c7

update lock file

83a36c1

update lock file to fix the pipeline failure

6a6ee79

Merge branch 'main' into wip/intent-swap-architecture-refactory

608187f

fix unit tests and pipeline issue.

7516d3b

Try to fix the pipeline failure of lock file change.

3e9f379

try to avoid the pipeline failure of lock file change.

9445620

refactor: simplify logic for determining transaction hashes in Bridge…

7f670b5

…StatusController

Fix the lint error in node 22 version

e8eb450

Fix weird lock file change failure issue in pipeline.

ce7a2d1

Run prettier format the README.md file.

7547553

change lock file again

5d56313

micaelae added 2 commits January 6, 2026 16:49

fix: ignore txHistory errors if intent is submitted

a3952b6

chore: match bridge-api intent order params

06c1583

micaelae requested review from a team as code owners January 7, 2026 00:53

micaelae marked this pull request as draft January 7, 2026 00:53

micaelae changed the base branch from main to wip/intent-swap-architecture-refactory January 7, 2026 00:54

cursor bot reviewed Jan 7, 2026

View reviewed changes

refactor: remove events in transaction controller

e530943

oscarwroche force-pushed the wip/intent-swap-architecture-refactory branch from fdba719 to e530943 Compare January 7, 2026 15:20

oscarwroche and others added 8 commits January 7, 2026 17:20

Merge branch 'main' into wip/intent-swap-architecture-refactory

80aa133

Merge branch 'wip/intent-swap-architecture-refactory' into wip/intent…

9e767a4

…-swap-architecture-refactory-txHistory-metrics

Merge branch 'main' into wip/intent-swap-architecture-refactory

306a564

chore: update bridge status controller changelog

a9f6b60

Merge branch 'wip/intent-swap-architecture-refactory' into wip/intent…

da0831b

…-swap-architecture-refactory-txHistory-metrics

Merge branch 'main' into wip/intent-swap-architecture-refactory

252beee

Merge branch 'main' into wip/intent-swap-architecture-refactory

e0d9b66

Merge branch 'wip/intent-swap-architecture-refactory' into wip/intent…

6e7c5be

…-swap-architecture-refactory-txHistory-metrics

Base automatically changed from wip/intent-swap-architecture-refactory to main January 9, 2026 12:05

micaelae added 2 commits January 13, 2026 13:33

Merge branch 'main' into wip/intent-swap-architecture-refactory-txHis…

676a625

…tory-metrics

chore: merge

3b5ea4d

micaelae force-pushed the wip/intent-swap-architecture-refactory-txHistory-metrics branch 3 times, most recently from f373323 to a16e6ae Compare January 13, 2026 22:12

chore: merge

7a0f130

micaelae force-pushed the wip/intent-swap-architecture-refactory-txHistory-metrics branch from a16e6ae to 7a0f130 Compare January 13, 2026 22:13

micaelae added 4 commits January 13, 2026 16:50

fix: types

c73caf8

fix: type error

13873c2

chore: undo changelog

94cf145

chore: rm catch

54198e2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

chore: populate swap intent metrics and rename txHistory keys#7564

chore: populate swap intent metrics and rename txHistory keys#7564
micaelae wants to merge 144 commits intomainfrom
wip/intent-swap-architecture-refactory-txHistory-metrics

micaelae commented Jan 7, 2026 •

edited by cursor bot

Loading

Uh oh!

cursor bot left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	// Check metadata for additional transaction hashes
	const metadataTxHashes = Array.isArray(intentOrder.metadata.txHashes)
	? intentOrder.metadata.txHashes
	: [];

	txHash: optional(StrictHexStruct),
	metadata: type({
	txHashes: optional(union([array(StrictHexStruct), StrictHexStruct])),
	}),


	export function mapIntentOrderStatusToTransactionStatus(
	intentStatus: IntentOrderStatus,
	): TransactionStatus {
	switch (intentStatus) {
	case IntentOrderStatus.PENDING:
	case IntentOrderStatus.SUBMITTED:
	return TransactionStatus.submitted;
	case IntentOrderStatus.CONFIRMED:
	case IntentOrderStatus.COMPLETED:
	return TransactionStatus.confirmed;
	case IntentOrderStatus.FAILED:
	case IntentOrderStatus.EXPIRED:
	return TransactionStatus.failed;
	default:
	return TransactionStatus.submitted;
	}

	].includes(intentOrder.status);
	const isFailed = [
	IntentOrderStatus.FAILED,
	IntentOrderStatus.EXPIRED,
	].includes(intentOrder.status);
	const isPending = [IntentOrderStatus.PENDING].includes(intentOrder.status);
	const isSubmitted = [IntentOrderStatus.SUBMITTED].includes(
	intentOrder.status,
	);

	if (isComplete) {
	statusType = StatusTypes.COMPLETE;
	} else if (isFailed) {
	statusType = StatusTypes.FAILED;
	} else if (isPending) {
	statusType = StatusTypes.PENDING;
	} else if (isSubmitted) {
	statusType = StatusTypes.SUBMITTED;
	} else {
	statusType = StatusTypes.UNKNOWN;

Uh oh!

Comments

Conversation

micaelae commented Jan 7, 2026 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Checklist

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Single string `txHashes` in metadata is silently discarded

`CANCELLED` intent status incorrectly maps to `submitted` instead of `failed`

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

micaelae commented Jan 7, 2026 •

edited by cursor bot

Loading